Merge "Attempt to clear memory after keyguard PIN entry" into sc-dev