Merge "Change system property of Oriole to place keyboard 10 dp higher" into sc-dev