Merge "Remove a hack to fix a short power button press behavior." into tm-qpr-dev