Merge "Make UiTestAutomationBridge see non-important views again" into jb-dev