Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Removed the min-max lenght help string
Merge pull request #7642 from frsela/STK/Bug831013

Bug 831013 - STK GET_INPUT and GET_INKEY shows min and max length in display text, r=vingtetun
Merge remote branch 'upstream/master'
Bug 830243 - Panel of icons at bottom of home screen are positioned partially off the bottom of your screen, after launching Secure Camera (from lock screen). r=etienne