Comment 4 for bug 1420493

Please also see bug 1472262, which is a separate but related issue. If the structures around lock timeout, display power and lock screen lock timeout get rethought, please take that into account also.