[Android] UI revamp/decoupling.