Merge "Don't consider input restricted when the lockscreen is disabled by an app." into cm-10.1

Change-Id: I7f4291dcc4003b2dffe7dde087d30e82c850ab9e