Merge "Change system property of Bramble to place keyboard 10 dp higher"