Merge "Add focusability into the hierarchy and Container transaction"