Merge "Update BiDiTest app for adding GridLayout unit tests"