Merge "Fix double counting of margins in keygaurd status bar view" into tm-dev