Merge "Avoid binder transaction to WM for lock orientation"