Merge "Default focus order now tries to adhere to view hierarchy"