Merge "Fix the keyboard focus issue for nested table view" into devel/master