Merge "Added callback to allow Face Unlock to hide black area" into ics-mr0