Merge "Developer Options module" into qt-dev am: 5606296767
am: 725e7df454

Change-Id: Ie936e87189c29d894b484725706c5915c566fc32