Merge "First batch of layoutTestController functions + some fixes and tweaks."