Merge "Wake-up device before showing bouncer from AoD"