Merge "Add unit test for Keyboards & HomeScaffold"