Merge "Update BiDiTest app for testing View padding"