Merge proposals dependent on lp://staging/~afrantzis/powerd/fix-1489326-screen-flash-when-proximity-covered

1. fix-1489326-screen-flash-when-proximity-covered
2. Dependent merge proposals