Merge "Update Javadoc of setLockTaskEnabled to reflect known issue" into pi-dev